From: Kenichi Handa <handa@etlken>
Date: Thu, 6 May 2010 00:50:39 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7006^2~43
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f6e1c5151cd2e163230c5f9417e76bf85f2a8230;p=emacs.git

merge trunk
---

f6e1c5151cd2e163230c5f9417e76bf85f2a8230